Merge git://git.denx.de/u-boot-imx
authorTom Rini <[email protected]>
Fri, 9 Mar 2018 18:29:58 +0000 (13:29 -0500)
committerTom Rini <[email protected]>
Fri, 9 Mar 2018 18:29:58 +0000 (13:29 -0500)

Trivial merge